From aaaf9dbf1ec4a1a966efe3224ac9a6f79551cdcb Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 18 Jul 2014 07:40:15 -0700
Subject: [PATCH] Update to master

---
 libs/hamcrest-rust   |  2 +-
 libs/hammer.rs       |  2 +-
 libs/toml-rs         |  2 +-
 tests/support/mod.rs | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libs/hamcrest-rust b/libs/hamcrest-rust
index 60b649957..05acf7681 160000
--- a/libs/hamcrest-rust
+++ b/libs/hamcrest-rust
@@ -1 +1 @@
-Subproject commit 60b649957b556c934929b7b6205ec95e20a2cd9e
+Subproject commit 05acf7681ab28198e5d7c1cc9561195de02d8d2a
diff --git a/libs/hammer.rs b/libs/hammer.rs
index fa1255d4b..ce9e79abe 160000
--- a/libs/hammer.rs
+++ b/libs/hammer.rs
@@ -1 +1 @@
-Subproject commit fa1255d4ba109f82d1b0e8be61dde4ea70047be9
+Subproject commit ce9e79abe94407abc155be13340d7a72ac5198d0
diff --git a/libs/toml-rs b/libs/toml-rs
index 05f8c0bc4..76cf3d1d3 160000
--- a/libs/toml-rs
+++ b/libs/toml-rs
@@ -1 +1 @@
-Subproject commit 05f8c0bc41a10f1e98e420f8d02d778541d13d48
+Subproject commit 76cf3d1d3ef0fb21ade21d313d8b67b65ed7e8ac
diff --git a/tests/support/mod.rs b/tests/support/mod.rs
index 1b025d815..227ccf2e7 100644
--- a/tests/support/mod.rs
+++ b/tests/support/mod.rs
@@ -241,17 +241,17 @@ struct Execs {
 
 impl Execs {
 
-    pub fn with_stdout<S: ToString>(mut ~self, expected: S) -> Box<Execs> {
+    pub fn with_stdout<S: ToString>(mut self, expected: S) -> Execs {
         self.expect_stdout = Some(expected.to_string());
         self
     }
 
-    pub fn with_stderr<S: ToString>(mut ~self, expected: S) -> Box<Execs> {
+    pub fn with_stderr<S: ToString>(mut self, expected: S) -> Execs {
         self.expect_stderr = Some(expected.to_string());
         self
     }
 
-    pub fn with_status(mut ~self, expected: int) -> Box<Execs> {
+    pub fn with_status(mut self, expected: int) -> Execs {
         self.expect_exit_code = Some(expected);
         self
     }
@@ -331,8 +331,8 @@ impl ham::Matcher<ProcessBuilder> for Execs {
     }
 }
 
-pub fn execs() -> Box<Execs> {
-    box Execs {
+pub fn execs() -> Execs {
+    Execs {
         expect_stdout: None,
         expect_stderr: None,
         expect_stdin: None,
@@ -362,8 +362,8 @@ impl<'a> ham::Matcher<&'a [u8]> for ShellWrites {
     }
 }
 
-pub fn shell_writes<T: Show>(string: T) -> Box<ShellWrites> {
-    box ShellWrites { expected: string.to_string() }
+pub fn shell_writes<T: Show>(string: T) -> ShellWrites {
+    ShellWrites { expected: string.to_string() }
 }
 
 pub trait ResultTest<T,E> {
-- 
2.30.2